bitkeeper revision 1.1236.1.48 (42266bcdE0YKInNbHNUP19tmx6VSdA)

Fix 32-bit build on 64-bit machines.
Signed-off-by: chris@xensource.com

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index af40ec3d2d18a15885b9cc0630d7c9226095bdcb..076cd24457e13d8bfba25469549b1d8b58a9eaad 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -102,6 +102,6 @@ libxc.so.$(MAJOR): libxc.so.$(MAJOR).$(MINOR)
        ln -sf $< $@
 
 libxc.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
-       $(CC) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -L../libxutil -lxutil -lz
+       $(CC) $(CFLAGS) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -L../libxutil -lxutil -lz
 
 -include $(DEPS)

diff --git a/tools/libxutil/Makefile b/tools/libxutil/Makefile
index a955c85cde3ad466e5287f2f2f5522101cea4d01..6a594917b5ed19b89f96bbeacd4729ca66520528 100644 (file)
--- a/tools/libxutil/Makefile
+++ b/tools/libxutil/Makefile
@@ -50,7 +50,7 @@ libxutil.so.$(MAJOR): libxutil.so.$(MAJOR).$(MINOR)
        ln -sf $^ $@
 
 libxutil.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
-       $(CC) -Wl,-soname -Wl,libxutil.so.$(MAJOR) -shared -o $@ $^
+       $(CC) $(CFLAGS) -Wl,-soname -Wl,libxutil.so.$(MAJOR) -shared -o $@ $^
 
 libxutil.a: $(LIB_OBJS)
        $(AR) rc $@ $^